Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 20:35:39 +0000 (12:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 20:35:39 +0000 (12:35 -0800)

Trivial merge